Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 20 Jun 2011 15:56:08 +0000 (08:56 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 20 Jun 2011 15:56:08 +0000 (08:56 -0700)
commitcc1f0170fd45078567c3da1f7e1727ac4f96770d
treeeea92e8b2f369118aaef7bcd83cd34b8a82720da
parentc82fbd548adeaa0e7ad3a0402507be04888298a7
parente97b0a2b2073ba55ff1bf4c29591ecc6b15e80dd
Merge from trunk.